auto upstream

diff --cc configure.ac
Simple merge

diff --cc lisp/emacs-lisp/edebug.el
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/emacsgtkfixed.c
index 9eedb57c81c2d9b0b018141e8d8b7f174cc58daf,970683da9c47852d5c69ef4093d72b9acf927974..6df0b2422b1e51b596c9982b6e3b5161b7ba5897
--- 1/src/emacsgtkfixed.c
--- 2/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@@ -26,11 -26,9 +26,11 @@@ along with GNU Emacs.  If not, see <htt
  #include "lisp.h"
  #include "frame.h"
  #include "xterm.h"
 -
 +#ifdef HAVE_XWIDGETS
 +#include "xwidget.h"
 +#endif
  /* Silence a bogus diagnostic; see GNOME bug 683906.  */
- #if (__GNUC__ == 4 && 6 <= __GNUC_MINOR__) || 4 < __GNUC__
+ #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
  # pragma GCC diagnostic push
  # pragma GCC diagnostic ignored "-Wunused-local-typedefs"
  #endif

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge